gtk/gtkcellrenderertext.h gtk/gtkentry.[ch] gtk/gtkimcontext.h

2008-10-30  Michael Natterer  <mitch@gimp.org>

	* gtk/gtkcellrenderertext.h
	* gtk/gtkentry.[ch]
	* gtk/gtkimcontext.h
	* gtk/gtklabel.c
	* gtk/gtkstyle.h: <pango/pango.h> is pulled in by <gdk/gdk.h>,
	remove its inclusion here.

svn path=/trunk/; revision=21735

diff --git a/ChangeLog b/ChangeLog
index e88fc63805d66ddb603a53ab92fc8acaf9c648a2..39db81524cae7fd2a009fd6d7dd264bde4dd3686 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-30  Michael Natterer  <mitch@gimp.org>
+
+       * gtk/gtkcellrenderertext.h
+       * gtk/gtkentry.[ch]
+       * gtk/gtkimcontext.h
+       * gtk/gtklabel.c
+       * gtk/gtkstyle.h: <pango/pango.h> is pulled in by <gdk/gdk.h>,
+       remove its inclusion here.
+
 2008-10-30  Michael Natterer  <mitch@imendio.com>
 
        * gtk/*.h: no need to include <gtk/gtkenums.h> in headers which

diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 2875b272cb7b96ae09cd679f1ec3fc48018f5b08..fb96219e546143e7b8c392a3cbc33cb0deea5886 100644 (file)
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -24,7 +24,7 @@
 #ifndef __GTK_CELL_RENDERER_TEXT_H__
 #define __GTK_CELL_RENDERER_TEXT_H__
 
-#include <pango/pango.h>
+
 #include <gtk/gtkcellrenderer.h>
 
 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 24d107a6ddb7d704b2fc7ca3cd9f378da41cb26d..9aedc510611d218d1f6126dafa2aac5d694a9093 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -22,14 +22,12 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #include "config.h"
 #include <string.h>
 
-#include <pango/pango.h>
-
 #include "gdk/gdkkeysyms.h"
 #include "gtkalignment.h"
 #include "gtkbindings.h"

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 0f6ba3d9844d2c054077f621a1194bb49e66b641..141603385989c2e18a0fa9b68f7a1baf86502deb 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -36,7 +36,6 @@
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkentrycompletion.h>
-#include <pango/pango.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index b1f3575ad68d16ae245ba774931617d763411d34..7e92f76cebc4d23790af7a92b21f3b3adc3f559a 100644 (file)
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -24,9 +24,10 @@
 #ifndef __GTK_IM_CONTEXT_H__
 #define __GTK_IM_CONTEXT_H__
 
+
 #include <gdk/gdk.h>
 #include <gtk/gtkobject.h>
-#include <pango/pango.h>
+
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 833eb4a3bc8922e8cfdf94bd3ef7e697f571d318..bce8a45c50693c462adc9aa22aff2dc025ba590e 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -20,12 +20,14 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #include "config.h"
+
 #include <math.h>
 #include <string.h>
+
 #include "gtklabel.h"
 #include "gtkaccellabel.h"
 #include "gtkdnd.h"
@@ -34,7 +36,6 @@
 #include "gtkwindow.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkclipboard.h"
-#include <pango/pango.h>
 #include "gtkimagemenuitem.h"
 #include "gtkintl.h"
 #include "gtkseparatormenuitem.h"

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 48c4ce8e101a06cdfffb751a8615d08747622e05..bef5c2bb83b52b0b98fbdc99a102bbe9375f469d 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -34,7 +34,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
-#include <pango/pango.h>
 
 
 G_BEGIN_DECLS